From 3bf85bb07fda4d907adb90cf447cf6f555c75af7 Mon Sep 17 00:00:00 2001 From: Andrew Watts Date: Fri, 21 Apr 2017 15:41:01 +0930 Subject: [PATCH] Fix non-deterministic --cfg feature flag list generation The resolved features were returned in a HashSet and then iterated over, which returns the feature names in arbitrary order. See #3895 --- src/cargo/ops/cargo_rustc/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs index 470f700f5..40c53731f 100644 --- a/src/cargo/ops/cargo_rustc/mod.rs +++ b/src/cargo/ops/cargo_rustc/mod.rs @@ -601,7 +601,7 @@ fn rustdoc(cx: &mut Context, unit: &Unit) -> CargoResult { rustdoc.arg("-o").arg(doc_dir); - for feat in cx.resolve.features(unit.pkg.package_id()) { + for feat in cx.resolve.features_sorted(unit.pkg.package_id()) { rustdoc.arg("--cfg").arg(&format!("feature=\"{}\"", feat)); } @@ -770,7 +770,7 @@ fn build_base_args(cx: &mut Context, cmd.arg("--cfg").arg("test"); } - for feat in cx.resolve.features(unit.pkg.package_id()).iter() { + for feat in cx.resolve.features_sorted(unit.pkg.package_id()) { cmd.arg("--cfg").arg(&format!("feature=\"{}\"", feat)); } -- 2.30.2